From 3ea905432e83ca7f88785a0b4be6aab0db3c7aac Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 17 Feb 2017 17:36:44 +0800 Subject: [PATCH] =?UTF-8?q?Refactor=20the=20=E2=80=98trace=E2=80=99=20pack?= =?UTF-8?q?age=20in=20skywalking-api=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../a/eye/skywalking/{trace => context}/ContextCarrier.java | 3 ++- .../a/eye/skywalking/{trace => context}/ContextManager.java | 4 +++- .../a/eye/skywalking/{trace => context}/TracerContext.java | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{trace => context}/ContextCarrier.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{trace => context}/ContextManager.java (90%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{trace => context}/TracerContext.java (96%) diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/ContextCarrier.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/ContextCarrier.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java index d9a45f819..85ccb13f5 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/ContextCarrier.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java @@ -1,5 +1,6 @@ -package com.a.eye.skywalking.trace; +package com.a.eye.skywalking.context; +import com.a.eye.skywalking.trace.TraceSegmentRef; import com.a.eye.skywalking.util.StringUtil; import java.io.Serializable; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/ContextManager.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java similarity index 90% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/ContextManager.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java index 46f07d391..2fa0f76b2 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/ContextManager.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java @@ -1,4 +1,6 @@ -package com.a.eye.skywalking.trace; +package com.a.eye.skywalking.context; + +import com.a.eye.skywalking.trace.TraceSegment; /** * {@link TracerContext} controls the whole context of {@link TraceSegment}. Any {@link TraceSegment} relates to diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/TracerContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java similarity index 96% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/TracerContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java index 1569cd1c0..1317c4e73 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/trace/TracerContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java @@ -1,5 +1,7 @@ -package com.a.eye.skywalking.trace; +package com.a.eye.skywalking.context; +import com.a.eye.skywalking.trace.Span; +import com.a.eye.skywalking.trace.TraceSegment; import com.a.eye.skywalking.util.TraceIdGenerator; import java.util.ArrayList; import java.util.List;