Provide v2 trace protocol, with no new feature, but make sure concept consistent.

common/JVM.proto

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "org.apache.skywalking.apm.network.language.agent";
+option csharp_namespace = "SkyWalking.NetworkProtocol";
+
+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;
+}

common/trace-common.proto

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "org.apache.skywalking.apm.network.language.agent";
+option csharp_namespace = "SkyWalking.NetworkProtocol";
+
+message UpstreamSegment {
+    repeated UniqueId globalTraceIds = 1;
+    bytes segment = 2; // the byte array of TraceSegmentObject
+}
+
+message UniqueId {
+    repeated int64 idParts = 1;
+}
+
+enum RefType {
+    CrossProcess = 0;
+    CrossThread = 1;
+}
+
+enum SpanLayer {
+    Unknown = 0;
+    Database = 1;
+    RPCFramework = 2;
+    Http = 3;
+    MQ = 4;
+    Cache = 5;
+}

language-agent-v2/JVMMetric.proto

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "org.apache.skywalking.apm.network.language.agent.v2";
+option csharp_namespace = "SkyWalking.NetworkProtocol";
+
+import "common/common.proto";
+import "common/JVM.proto";
+
+service JVMMetricReportService {
+    rpc collect (JVMMetrics) returns (Downstream) {
+    }
+}
+
+message JVMMetricCollection {
+    repeated JVMMetric metrics = 1;
+    int32 serviceInstanceId = 2;
+}

language-agent-v2/trace.proto

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "org.apache.skywalking.apm.network.language.agent.v2";
+option csharp_namespace = "SkyWalking.NetworkProtocol";
+
+import "common/common.proto";
+
+service TraceSegmentReportService {
+    rpc collect (stream UpstreamSegment) returns (Downstream) {
+    }
+}
+
+message TraceSegmentObject {
+    UniqueId traceSegmentId = 1;
+    repeated SpanObject spans = 2;
+    int32 serviceId = 3;
+    int32 serviceInstanceId = 4;
+    bool isSizeLimited = 5;
+}
+
+message TraceSegmentReference {
+    RefType refType = 1;
+    UniqueId parentTraceSegmentId = 2;
+    int32 parentSpanId = 3;
+    int32 parentServiceInstanceId = 4;
+    string networkAddress = 5;
+    int32 networkAddressId = 6;
+    int32 entryServiceInstanceId = 7;
+    string entryEndpoint = 8;
+    int32 entryEndpointId = 9;
+    string parentEndpoint = 10;
+    int32 parentEndopintId = 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;
+}
+
+message Log {
+    int64 time = 1;
+    repeated KeyStringValuePair data = 2;
+}

language-agent/JVMMetricsService.proto

@@ -23,61 +23,9 @@ option java_package = "org.apache.skywalking.apm.network.language.agent";
 option csharp_namespace = "SkyWalking.NetworkProtocol";
 
 import "language-agent/Downstream.proto";
+import "common/JVM.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;
-}

language-agent/TraceSegmentService.proto

@@ -25,21 +25,13 @@ option csharp_namespace = "SkyWalking.NetworkProtocol";
 import "language-agent/Common.proto";
 import "language-agent/Downstream.proto";
 import "language-agent/KeyWithStringValue.proto";
+import "common/trace-common.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;
@@ -81,20 +73,6 @@ message SpanObject {
     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;

register/InstancePing.proto

@@ -19,7 +19,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.register";
+option java_package = "org.apache.skywalking.apm.network.register.v2";
 option csharp_namespace = "SkyWalking.NetworkProtocol";
 
 import "common/common.proto";

register/Register.proto

@@ -19,7 +19,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.register";
+option java_package = "org.apache.skywalking.apm.network.register.v2";
 option csharp_namespace = "SkyWalking.NetworkProtocol";
 
 import "common/common.proto";