From b68c7b436823797eec0a0c93422571ca3280830c Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 3 Jul 2017 23:05:10 +0800 Subject: [PATCH] Remove global traceId in Segment. --- apm-network/src/main/proto/TraceSegmentService.proto | 7 +++---- .../apm/agent/core/context/trace/TraceSegment.java | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apm-network/src/main/proto/TraceSegmentService.proto b/apm-network/src/main/proto/TraceSegmentService.proto index 72acf8ccc..755356dc9 100644 --- a/apm-network/src/main/proto/TraceSegmentService.proto +++ b/apm-network/src/main/proto/TraceSegmentService.proto @@ -19,10 +19,9 @@ message UpstreamSegment { message TraceSegmentObject { string traceSegmentId = 1; repeated TraceSegmentReference refs = 2; - repeated string globalTraceIds = 3; - repeated SpanObject spans = 4; - int32 applicationId = 5; - int32 applicationInstanceId = 6; + repeated SpanObject spans = 3; + int32 applicationId = 4; + int32 applicationInstanceId = 5; } message TraceSegmentReference { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegment.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegment.java index 7e34dffad..d36bada68 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegment.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegment.java @@ -203,10 +203,6 @@ public class TraceSegment { traceSegmentBuilder.addRefs(ref.transform()); } } - // globalTraceIds - for (DistributedTraceId distributedTraceId : getRelatedGlobalTraces()) { - traceSegmentBuilder.addGlobalTraceIds(distributedTraceId.get()); - } // SpanObject for (AbstractTracingSpan span : this.spans) { traceSegmentBuilder.addSpans(span.transform());