This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 074acb1  Application.yml configuration change. (#893)
074acb1 is described below

commit 074acb13c8fb4d449b2922e6b6e3f078481178b4
Author: 彭勇升 pengys <8082...@qq.com>
AuthorDate: Wed Mar 7 06:21:29 2018 +0800

    Application.yml configuration change. (#893)
---
 docs/cn/Deploy-backend-in-cluster-mode-CN.md |  10 +-
 docs/cn/Trace-Data-Protocol-CN.md            | 162 ++++++++++++++++++++++++++-
 docs/en/Deploy-backend-in-cluster-mode.md    |  18 +--
 docs/en/Deploy-backend-in-standalone-mode.md |   4 +-
 4 files changed, 179 insertions(+), 15 deletions(-)

diff --git a/docs/cn/Deploy-backend-in-cluster-mode-CN.md 
b/docs/cn/Deploy-backend-in-cluster-mode-CN.md
index deff7b7..b2d2300 100644
--- a/docs/cn/Deploy-backend-in-cluster-mode-CN.md
+++ b/docs/cn/Deploy-backend-in-cluster-mode-CN.md
@@ -1,7 +1,7 @@
 ## 所需的第三方软件
 - 被监控程序要求JDK6+
-- sky-walking server和webui要求JDK8+
-- Elasticsearch 5.3
+- SkyWalking collector和WebUI要求JDK8+
+- Elasticsearch 5.x
 - Zookeeper 3.4.10
 
 ## 下载发布版本
@@ -55,7 +55,11 @@ agent_jetty:
     host: localhost
     port: 12800
     context_path: /
-agent_stream:
+analysis_register:
+  default:
+analysis_jvm:
+  default:
+analysis_segment_parser:
   default:
     buffer_file_path: ../buffer/
     buffer_offset_max_file_size: 10M
diff --git a/docs/cn/Trace-Data-Protocol-CN.md 
b/docs/cn/Trace-Data-Protocol-CN.md
index 51c9afe..32b649a 100644
--- a/docs/cn/Trace-Data-Protocol-CN.md
+++ b/docs/cn/Trace-Data-Protocol-CN.md
@@ -8,8 +8,8 @@ Trace Data Protocol协议,也就是探针与Collector间通讯协议
 v1.1
 
 ### 协议类型
-* 服务发现使用http服务
-* 注册和数据上行服务同时支持gRPC和HTTP服务
+* 服务发现使用HTTP服务
+* 注册和数据上行服务同时支持gRPC和HTTP JSON服务
 
 #### gRPC协议定义文件
 [gRPC proto files](../../apm-protocol/apm-network/src/main/proto)
@@ -34,7 +34,7 @@ JSON数组,数组的每个元素,为一个有效的gRPC服务地址。
 
 ## 应用注册服务
 ### 简介
-应用注册服务,是将applicationCode,以及ip:port构成的服务地址,转换成数字ID的服务。
+应用注册服务,是将applicationCode,转换成数字ID的服务。
 此服务会在后续的传输过程中,有效降低网络带宽需求。
 
 ### 协议内容
@@ -76,6 +76,16 @@ gRPC服务
 - 可选服务,可有效降低网络消耗,推荐实现。注意,由于部分应用存在URI中夹带参数的情况,请注意限制探针内的缓存容量,防止内存溢出。
 - 
ServiceNameElement中,applicationId为当前applicationCode对应的id。serviceName一般为对应span的operationName
 
+## 地址注册发现服务
+### 简介
+地址注册发现服务,是将远程调用(RPC、MQ、DB...)地址的(addresses)替换为id的服务。
+
+### 协议内容
+[gRPC service 
define](../../apm-protocol/apm-network/src/main/proto/NetworkAddressRegisterService.proto)
+
+- 可选服务,可有效降低网络消耗,推荐实现。
+- NetworkAddresses中,addresses为被调方的地址(IP/HOST:PORT)多个地址使用逗号分隔
+
 ## JVM指标上报服务
 ### 简介
 上报当前实例的JVM信息,每秒上报一次。
@@ -99,3 +109,149 @@ gRPC服务
   - parentServiceName/parentServiceId
   - peerId/peer
 - 
componentId为默认支持的插件id,非官方支持,需传输名称或修改服务端源代码。[官方组件列表](../../apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java)
+
+### 协议类型
+HTTP JSON服务, 属性名与gRPC对应,属性解释详见gRPC协议说明,统一采用HTTP POST方式
+
+### 实例注册服务
+地址: http://ip:port/instance/register(default: localhost:12800) 
+
+输入:
+```
+{
+    ai: x, #applicationId
+    au: "", #agentUUID
+    rt: x, #registerTime
+    oi: "", #osinfo
+}
+```
+
+输出:
+```
+{
+    ai: x, #applicationId
+    ii: x, #applicationInstanceId
+}
+```
+
+### 实例心跳服务
+地址: http://ip:port/instance/heartbeat(default: localhost:12800) 
+
+输入:
+```
+{
+    "ii": x, #applicationInstanceId
+    "ht": x #heartbeatTime, java timestamp format
+}
+```
+
+输出:无
+
+## 服务名注册发现服务
+地址: http://ip:port/servicename/discovery(default: localhost:12800) 
+
+输入:
+```
+{
+    ai: x, #applicationId
+    sn: "", #serviceName
+    st: x, #srcSpanType
+}
+```
+
+输出:
+```
+{
+    si: x, #osinfo
+    el: { #element
+        ai: x, #applicationId
+        sn: "", #serviceName
+        st: x, #srcSpanType
+    }
+}
+```
+
+## JVM指标上报服务
+### 暂无支持需求,java和c#的探针都采用gRPC的方式上报
+
+## TraceSegment上报服务
+### 一次可以发送多个Segment,采用JSON数组的形式
+输入:
+```
+[
+  {
+    "gt": [[230150, 185809, 24040000]], //globalTraceIds 链路编码,与调用方相同
+    "sg": { //TraceSegmentObject 
+      "ts": [137150, 185809, 48780000], //traceSegmentId,新产生
+      "ai": 2, //applicationId
+      "ii": 3, //applicationInstanceId
+      "ss": [ //SpanObject
+        {
+          "si": 0, //spanId
+          "tv": 0, //SpanType
+          "lv": 2, //SpanLayer
+          "ps": -1, //parentSpanId
+          "st": 1501858094726, //startTime
+          "et": 1501858096804, //endTime
+          "ci": 3, //componentId
+          "cn": "", //component
+          "oi": 0, //operationNameId
+          "on": 
"org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 
//operationName
+          "pi": 0, //peerId
+          "pn": "", //peer
+          "ie": false, //isError
+          "rs": [ //TraceSegmentReference
+            {
+              "pts": [230150, 185809, 24040000], //parentTraceSegmentId, 
上级的segment_id 一个应用中的一个实例在链路中产生的编号
+              "pii": 2, //parentApplicationInstanceId, 上级的实例编号
+              "psp": 1, //parentSpanId, 上级的埋点编号span_id
+              "psi": 0, //parentServiceId, 
上级的服务编号(org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()注册后的ID)
+              "psn": "/dubbox-case/case/dubbox-rest", //parentServiceName, 
上级的服务名
+              "ni": 0,  //networkAddressId, 上级调用时使用的地址注册后的ID
+              "nn": "172.25.0.4:20880", //networkAddress, 上级的地址
+              "eii": 2, //entryApplicationInstanceId, 入口的实例编号
+              "esi": 0, //entryServiceId, 入口的服务编号
+              "esn": "/dubbox-case/case/dubbox-rest", //entryServiceName, 
入口的服务名词
+              "rn": 0 //RefType, 调用方式(CrossProcess,CrossThread)
+            }
+          ],
+          "to": [ //KeyWithStringValue
+            {
+              "k": "url", //key
+              "v": 
"rest://172.25.0.4:20880/org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
 //value
+            },
+            {
+              "k": "http.method",
+              "v": "GET"
+            }
+          ],
+          "lo": { //LogMessage
+            "t": 1501858094726,
+            "d": [
+                "k": "NullPointException",
+                "v": "Error Stack"
+            }
+          }
+        },
+        {
+          "si": 1,
+          "tv": 1,
+          "lv": 1,
+          "ps": 0,
+          "st": 1501858094726,
+          "et": 1501858095804,
+          "ci": 9,
+          "cn": "",
+          "oi": 0,
+          "on": 
"mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]",
+          "pi": 0,
+          "pn": "localhost:27017",
+          "ie": false,
+          "to": [],
+          "lo": []
+        }
+      ]
+    }
+  }
+]
+```
diff --git a/docs/en/Deploy-backend-in-cluster-mode.md 
b/docs/en/Deploy-backend-in-cluster-mode.md
index 80a7948..d719704 100644
--- a/docs/en/Deploy-backend-in-cluster-mode.md
+++ b/docs/en/Deploy-backend-in-cluster-mode.md
@@ -1,7 +1,7 @@
 ## Required of third party softwares
 - JDK 6+(instruments application can run in jdk6)
-- JDK8  ( skywalking collector and skywalking ui )
-- Elasticsearch 5.2.2 or 5.3, cluster mode or not
+- JDK8  ( SkyWalking collector and SkyWalking WebUI )
+- Elasticsearch 5.x, cluster mode or not
 - Zookeeper 3.4.10
 
 ## Download released version
@@ -37,10 +37,10 @@ cluster:
     sessionTimeout: 100000
 naming:
 # Host and port used for agent config
-  jetty:
-    host: localhost
-    port: 10800
-    context_path: /
+    jetty:
+        host: localhost
+        port: 10800
+        context_path: /
 remote:
   gRPC:
     host: localhost
@@ -54,7 +54,11 @@ agent_jetty:
     host: localhost
     port: 12800
     context_path: /
-agent_stream:
+analysis_register:
+  default:
+analysis_jvm:
+  default:
+analysis_segment_parser:
   default:
     buffer_file_path: ../buffer/
     buffer_offset_max_file_size: 10M
diff --git a/docs/en/Deploy-backend-in-standalone-mode.md 
b/docs/en/Deploy-backend-in-standalone-mode.md
index 543f487..f44c158 100644
--- a/docs/en/Deploy-backend-in-standalone-mode.md
+++ b/docs/en/Deploy-backend-in-standalone-mode.md
@@ -1,7 +1,7 @@
-# Usage scenario
+# Usage scenario(no provide in alpha version,planning provide in beta version)
 Default standalong mode collector means don't support cluster. It uses H2 as 
storage layer implementation, suggest that use only for preview, test, 
demonstration, low throughputs and small scale system.
 
-If you are using skywalking in a low throughputs monitoring scenario, and 
don't want to deploy cluster, at least, switch the storage implementation from 
H2 to  Elasticsearch.
+If you are using SkyWalking in a low throughputs monitoring scenario, and 
don't want to deploy cluster, at least, switch the storage implementation from 
H2 to Elasticsearch.
 
 **H2 storage implementation is not provided in 5.0.0-alpha, so you must deploy 
ElasticSearch before try to start backend**
 

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.

Reply via email to