You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/02/23 03:47:02 UTC
[incubator-skywalking] branch submodule updated: Add submodule
links for protocol
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch submodule
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/submodule by this push:
new 3b3a20e Add submodule links for protocol
3b3a20e is described below
commit 3b3a20e251f0eb8dc20a8b7942607c77f07c7d26
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Feb 23 11:46:30 2018 +0800
Add submodule links for protocol
---
.gitmodules | 3 +
apm-protocol/apm-network/src/main/proto | 1 +
.../main/proto/ApplicationRegisterService.proto | 20 ------
.../apm-network/src/main/proto/Common.proto | 10 ---
.../src/main/proto/DiscoveryService.proto | 72 -------------------
.../apm-network/src/main/proto/Downstream.proto | 8 ---
.../src/main/proto/JVMMetricsService.proto | 64 -----------------
.../src/main/proto/KeyWithIntegerValue.proto | 9 ---
.../src/main/proto/KeyWithStringValue.proto | 9 ---
.../main/proto/NetworkAddressRegisterService.proto | 19 -----
.../src/main/proto/TraceSegmentService.proto | 82 ----------------------
11 files changed, 4 insertions(+), 293 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 7f0ca91..050e4c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "skywalking-ui"]
path = skywalking-ui
url = https://github.com/apache/incubator-skywalking-ui
+[submodule "apm-protocol/apm-network/src/main/proto"]
+ path = apm-protocol/apm-network/src/main/proto
+ url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git
diff --git a/apm-protocol/apm-network/src/main/proto b/apm-protocol/apm-network/src/main/proto
new file mode 160000
index 0000000..86bfe4f
--- /dev/null
+++ b/apm-protocol/apm-network/src/main/proto
@@ -0,0 +1 @@
+Subproject commit 86bfe4f6635a8f71abca2383f54565b621ed3f94
diff --git a/apm-protocol/apm-network/src/main/proto/ApplicationRegisterService.proto b/apm-protocol/apm-network/src/main/proto/ApplicationRegisterService.proto
deleted file mode 100644
index e5b4dee..0000000
--- a/apm-protocol/apm-network/src/main/proto/ApplicationRegisterService.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-import "KeyWithIntegerValue.proto";
-
-//register service for ApplicationCode, this service is called when service starts.
-service ApplicationRegisterService {
- rpc applicationCodeRegister (Application) returns (ApplicationMapping) {
- }
-}
-
-message Application {
- string applicationCode = 1;
-}
-
-message ApplicationMapping {
- KeyWithIntegerValue application = 1;
-}
diff --git a/apm-protocol/apm-network/src/main/proto/Common.proto b/apm-protocol/apm-network/src/main/proto/Common.proto
deleted file mode 100644
index 9142490..0000000
--- a/apm-protocol/apm-network/src/main/proto/Common.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-enum SpanType {
- Entry = 0;
- Exit = 1;
- Local = 2;
-}
\ No newline at end of file
diff --git a/apm-protocol/apm-network/src/main/proto/DiscoveryService.proto b/apm-protocol/apm-network/src/main/proto/DiscoveryService.proto
deleted file mode 100644
index c4c06ca..0000000
--- a/apm-protocol/apm-network/src/main/proto/DiscoveryService.proto
+++ /dev/null
@@ -1,72 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-import "Common.proto";
-import "Downstream.proto";
-
-service InstanceDiscoveryService {
- rpc registerInstance (ApplicationInstance) returns (ApplicationInstanceMapping) {
- }
-
- rpc heartbeat (ApplicationInstanceHeartbeat) returns (Downstream) {
- }
-
-}
-
-message ApplicationInstance {
- int32 applicationId = 1;
- string agentUUID = 2;
- int64 registerTime = 3;
- OSInfo osinfo = 4;
-}
-
-message ApplicationInstanceMapping {
- int32 applicationId = 1;
- int32 applicationInstanceId = 2;
-}
-
-message ApplicationInstanceRecover {
- int32 applicationId = 1;
- int32 applicationInstanceId = 2;
- int64 registerTime = 3;
- OSInfo osinfo = 4;
-}
-
-message ApplicationInstanceHeartbeat {
- int32 applicationInstanceId = 1;
- int64 heartbeatTime = 2;
-}
-
-message OSInfo {
- string osName = 1;
- string hostname = 2;
- int32 processNo = 3;
- repeated string ipv4s = 4;
-}
-
-//discovery service for ServiceName by Network address or application code
-service ServiceNameDiscoveryService {
- rpc discovery (ServiceNameCollection) returns (ServiceNameMappingCollection) {
- }
-}
-
-message ServiceNameCollection {
- repeated ServiceNameElement elements = 1;
-}
-
-message ServiceNameMappingCollection {
- repeated ServiceNameMappingElement elements = 1;
-}
-
-message ServiceNameMappingElement {
- int32 serviceId = 1;
- ServiceNameElement element = 2;
-}
-
-message ServiceNameElement {
- string serviceName = 1;
- int32 applicationId = 2;
- SpanType srcSpanType = 3;
-}
diff --git a/apm-protocol/apm-network/src/main/proto/Downstream.proto b/apm-protocol/apm-network/src/main/proto/Downstream.proto
deleted file mode 100644
index bf38d53..0000000
--- a/apm-protocol/apm-network/src/main/proto/Downstream.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-// nothing down stream from collector yet.
-message Downstream {
-}
diff --git a/apm-protocol/apm-network/src/main/proto/JVMMetricsService.proto b/apm-protocol/apm-network/src/main/proto/JVMMetricsService.proto
deleted file mode 100644
index 6e07434..0000000
--- a/apm-protocol/apm-network/src/main/proto/JVMMetricsService.proto
+++ /dev/null
@@ -1,64 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-import "Downstream.proto";
-
-service JVMMetricsService {
- rpc collect (JVMMetrics) returns (Downstream) {
- }
-}
-
-message JVMMetrics {
- repeated JVMMetric metrics = 1;
- int32 applicationInstanceId = 2;
-}
-
-message JVMMetric {
- int64 time = 1;
- CPU cpu = 2;
- repeated Memory memory = 3;
- repeated MemoryPool memoryPool = 4;
- repeated GC gc = 5;
-}
-
-message CPU {
- double usagePercent = 2;
-}
-
-message Memory {
- bool isHeap = 1;
- int64 init = 2;
- int64 max = 3;
- int64 used = 4;
- int64 committed = 5;
-}
-
-message MemoryPool {
- PoolType type = 1;
- int64 init = 2;
- int64 max = 3;
- int64 used = 4;
- int64 commited = 5;
-}
-
-enum PoolType {
- CODE_CACHE_USAGE = 0;
- NEWGEN_USAGE = 1;
- OLDGEN_USAGE = 2;
- SURVIVOR_USAGE = 3;
- PERMGEN_USAGE = 4;
- METASPACE_USAGE = 5;
-}
-
-message GC {
- GCPhrase phrase = 1;
- int64 count = 2;
- int64 time = 3;
-}
-
-enum GCPhrase {
- NEW = 0;
- OLD = 1;
-}
diff --git a/apm-protocol/apm-network/src/main/proto/KeyWithIntegerValue.proto b/apm-protocol/apm-network/src/main/proto/KeyWithIntegerValue.proto
deleted file mode 100644
index c01f498..0000000
--- a/apm-protocol/apm-network/src/main/proto/KeyWithIntegerValue.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-message KeyWithIntegerValue {
- string key = 1;
- int32 value = 2;
-}
diff --git a/apm-protocol/apm-network/src/main/proto/KeyWithStringValue.proto b/apm-protocol/apm-network/src/main/proto/KeyWithStringValue.proto
deleted file mode 100644
index 92cbd45..0000000
--- a/apm-protocol/apm-network/src/main/proto/KeyWithStringValue.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-message KeyWithStringValue {
- string key = 1;
- string value = 2;
-}
diff --git a/apm-protocol/apm-network/src/main/proto/NetworkAddressRegisterService.proto b/apm-protocol/apm-network/src/main/proto/NetworkAddressRegisterService.proto
deleted file mode 100644
index 15a6b31..0000000
--- a/apm-protocol/apm-network/src/main/proto/NetworkAddressRegisterService.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-import "KeyWithIntegerValue.proto";
-
-service NetworkAddressRegisterService {
- rpc batchRegister (NetworkAddresses) returns (NetworkAddressMappings) {
- }
-}
-
-message NetworkAddresses {
- repeated string addresses = 1;
-}
-
-message NetworkAddressMappings {
- repeated KeyWithIntegerValue addressIds = 1;
-}
diff --git a/apm-protocol/apm-network/src/main/proto/TraceSegmentService.proto b/apm-protocol/apm-network/src/main/proto/TraceSegmentService.proto
deleted file mode 100644
index f58fbbf..0000000
--- a/apm-protocol/apm-network/src/main/proto/TraceSegmentService.proto
+++ /dev/null
@@ -1,82 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.proto";
-
-import "Common.proto";
-import "Downstream.proto";
-import "KeyWithStringValue.proto";
-
-service TraceSegmentService {
- rpc collect (stream UpstreamSegment) returns (Downstream) {
- }
-}
-
-message UpstreamSegment {
- repeated UniqueId globalTraceIds = 1;
- bytes segment = 2; // the byte array of TraceSegmentObject
-}
-
-message UniqueId {
- repeated int64 idParts = 1;
-}
-
-message TraceSegmentObject {
- UniqueId traceSegmentId = 1;
- repeated SpanObject spans = 2;
- int32 applicationId = 3;
- int32 applicationInstanceId = 4;
- bool isSizeLimited = 5;
-}
-
-message TraceSegmentReference {
- RefType refType = 1;
- UniqueId parentTraceSegmentId = 2;
- int32 parentSpanId = 3;
- int32 parentApplicationInstanceId = 4;
- string networkAddress = 5;
- int32 networkAddressId = 6;
- int32 entryApplicationInstanceId = 7;
- string entryServiceName = 8;
- int32 entryServiceId = 9;
- string parentServiceName = 10;
- int32 parentServiceId = 11;
-}
-
-message SpanObject {
- int32 spanId = 1;
- int32 parentSpanId = 2;
- int64 startTime = 3;
- int64 endTime = 4;
- repeated TraceSegmentReference refs = 5;
- int32 operationNameId = 6;
- string operationName = 7;
- int32 peerId = 8;
- string peer = 9;
- SpanType spanType = 10;
- SpanLayer spanLayer = 11;
- int32 componentId = 12;
- string component = 13;
- bool isError = 14;
- repeated KeyWithStringValue tags = 15;
- repeated LogMessage logs = 16;
-}
-
-enum RefType {
- CrossProcess = 0;
- CrossThread = 1;
-}
-
-enum SpanLayer {
- Unknown = 0;
- Database = 1;
- RPCFramework = 2;
- Http = 3;
- MQ = 4;
- Cache = 5;
-}
-
-message LogMessage {
- int64 time = 1;
- repeated KeyWithStringValue data = 2;
-}
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.