[incubator-skywalking-data-collect-protocol] branch master updated: no message

[wu...@apache.org]

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-data-collect-protocol.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c4b7e9  no message
5c4b7e9 is described below

commit 5c4b7e962d9ea80a3447dfdf94d06a1634936638
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Nov 19 11:23:03 2018 +0800

    no message
---
 common/trace-common.proto     |  6 ++++++
 language-agent-v2/trace.proto | 10 +++++-----
 language-agent/Common.proto   | 29 -----------------------------
 3 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/common/trace-common.proto b/common/trace-common.proto
index b9bdb78..dcbe03d 100644
--- a/common/trace-common.proto
+++ b/common/trace-common.proto
@@ -27,6 +27,12 @@ message UpstreamSegment {
     bytes segment = 2; // the byte array of TraceSegmentObject
 }
 
+enum SpanType {
+    Entry = 0;
+    Exit = 1;
+    Local = 2;
+}
+
 message UniqueId {
     repeated int64 idParts = 1;
 }
diff --git a/language-agent-v2/trace.proto b/language-agent-v2/trace.proto
index e13c4a0..b7a097e 100644
--- a/language-agent-v2/trace.proto
+++ b/language-agent-v2/trace.proto
@@ -23,22 +23,22 @@ option java_package = "org.apache.skywalking.apm.network.language.agent.v2";
 option csharp_namespace = "SkyWalking.NetworkProtocol";
 
 import "common/common.proto";
-import "trace-common.proto";
+import "common/trace-common.proto";
 
 service TraceSegmentReportService {
     rpc collect (stream UpstreamSegment) returns (Commands) {
     }
 }
 
-message TraceSegmentObject {
+message SegmentObject {
     UniqueId traceSegmentId = 1;
-    repeated SpanObject spans = 2;
+    repeated SpanObjectV2 spans = 2;
     int32 serviceId = 3;
     int32 serviceInstanceId = 4;
     bool isSizeLimited = 5;
 }
 
-message TraceSegmentReference {
+message SegmentReference {
     RefType refType = 1;
     UniqueId parentTraceSegmentId = 2;
     int32 parentSpanId = 3;
@@ -52,7 +52,7 @@ message TraceSegmentReference {
     int32 parentEndopintId = 11;
 }
 
-message SpanObject {
+message SpanObjectV2 {
     int32 spanId = 1;
     int32 parentSpanId = 2;
     int64 startTime = 3;
diff --git a/language-agent/Common.proto b/language-agent/Common.proto
deleted file mode 100644
index ecca8c6..0000000
--- a/language-agent/Common.proto
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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";
-
-enum SpanType {
-    Entry = 0;
-    Exit = 1;
-    Local = 2;
-}