You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/07/14 07:45:00 UTC
[skywalking] branch zipkin updated: Finish the code prototype.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch zipkin
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/zipkin by this push:
new 84267e5 Finish the code prototype.
84267e5 is described below
commit 84267e5b24d9b6ae5961298298cc4452ee247ab7
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Jul 14 15:44:40 2020 +0800
Finish the code prototype.
---
.../zipkin/CommandExecutorServiceBlocker.java | 38 ++++++++++++++++++++++
...textManager.java => CommandServiceBlocker.java} | 24 +++++---------
...ContextManager.java => JVMBlockingService.java} | 24 +++++---------
...ontextManager.java => MeterServiceBlocker.java} | 29 ++++++++---------
.../zipkin/ProfileTaskChannelServiceBlocker.java | 38 ++++++++++++++++++++++
...ava => ProfileTaskExecutionServiceBlocker.java} | 24 +++++---------
...er.java => ServiceManagementClientBlocker.java} | 24 +++++---------
.../reporter/zipkin/ZipkinContextManager.java | 2 +-
.../reporter/zipkin/ZipkinTraceReporter.java | 7 +++-
.../reporter/zipkin/ZipkinTracerContext.java | 11 +++++--
...ache.skywalking.apm.agent.core.boot.BootService | 16 ++++-----
11 files changed, 149 insertions(+), 88 deletions(-)
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/CommandExecutorServiceBlocker.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/CommandExecutorServiceBlocker.java
new file mode 100644
index 0000000..719e62e
--- /dev/null
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/CommandExecutorServiceBlocker.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.skywalking.apm.plugin.reporter.zipkin;
+
+import org.apache.skywalking.apm.agent.core.commands.CommandExecutorService;
+
+/**
+ * CommandExecutorServiceBlocker blocks the original implementation.
+ */
+public class CommandExecutorServiceBlocker extends CommandExecutorService {
+ @Override
+ public void prepare() throws Throwable {
+ }
+
+ @Override
+ public void boot() throws Throwable {
+ }
+
+ @Override
+ public void shutdown() throws Throwable {
+ }
+}
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/CommandServiceBlocker.java
similarity index 50%
copy from apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
copy to apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/CommandServiceBlocker.java
index eb22db6..c3870dd 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/CommandServiceBlocker.java
@@ -19,28 +19,22 @@
package org.apache.skywalking.apm.plugin.reporter.zipkin;
import org.apache.skywalking.apm.agent.core.boot.OverrideImplementor;
-import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
-import org.apache.skywalking.apm.agent.core.context.AbstractTracerContext;
-import org.apache.skywalking.apm.agent.core.context.ContextManagerExtendService;
+import org.apache.skywalking.apm.agent.core.commands.CommandService;
/**
- * ZipkinContextManager used Brave APIs to manage the Zipkin tracing context, including span start/stop/tag/log,
- * inject/extract in across process, and capture/continue in across thread.
+ * CommandServiceBlocker blocks the original implementation.
*/
-@OverrideImplementor(ContextManagerExtendService.class)
-public class ZipkinContextManager extends ContextManagerExtendService {
- private ZipkinTraceReporter zipkinTraceReporter;
+@OverrideImplementor(CommandService.class)
+public class CommandServiceBlocker extends CommandService {
+ @Override
+ public void prepare() throws Throwable {
+ }
@Override
- public void prepare() {
- zipkinTraceReporter = ServiceManager.INSTANCE.findService(ZipkinTraceReporter.class);
+ public void boot() throws Throwable {
}
- /**
- * Create AbstractTracerContext with as all new Zipkin tracer.
- */
@Override
- public AbstractTracerContext createTraceContext(final String operationName, final boolean forceSampling) {
- return new ZipkinTracerContext(zipkinTraceReporter.getTracing());
+ public void shutdown() throws Throwable {
}
}
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/JVMBlockingService.java
similarity index 50%
copy from apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
copy to apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/JVMBlockingService.java
index eb22db6..02a263d 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/JVMBlockingService.java
@@ -19,28 +19,22 @@
package org.apache.skywalking.apm.plugin.reporter.zipkin;
import org.apache.skywalking.apm.agent.core.boot.OverrideImplementor;
-import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
-import org.apache.skywalking.apm.agent.core.context.AbstractTracerContext;
-import org.apache.skywalking.apm.agent.core.context.ContextManagerExtendService;
+import org.apache.skywalking.apm.agent.core.jvm.JVMService;
/**
- * ZipkinContextManager used Brave APIs to manage the Zipkin tracing context, including span start/stop/tag/log,
- * inject/extract in across process, and capture/continue in across thread.
+ * Zipkin doesn't receive any metrics data, including JVM, override the default implementation.
*/
-@OverrideImplementor(ContextManagerExtendService.class)
-public class ZipkinContextManager extends ContextManagerExtendService {
- private ZipkinTraceReporter zipkinTraceReporter;
+@OverrideImplementor(JVMService.class)
+public class JVMBlockingService extends JVMService {
+ @Override
+ public void prepare() throws Throwable {
+ }
@Override
- public void prepare() {
- zipkinTraceReporter = ServiceManager.INSTANCE.findService(ZipkinTraceReporter.class);
+ public void boot() throws Throwable {
}
- /**
- * Create AbstractTracerContext with as all new Zipkin tracer.
- */
@Override
- public AbstractTracerContext createTraceContext(final String operationName, final boolean forceSampling) {
- return new ZipkinTracerContext(zipkinTraceReporter.getTracing());
+ public void shutdown() throws Throwable {
}
}
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/MeterServiceBlocker.java
similarity index 50%
copy from apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
copy to apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/MeterServiceBlocker.java
index eb22db6..fb09e09 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/MeterServiceBlocker.java
@@ -19,28 +19,27 @@
package org.apache.skywalking.apm.plugin.reporter.zipkin;
import org.apache.skywalking.apm.agent.core.boot.OverrideImplementor;
-import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
-import org.apache.skywalking.apm.agent.core.context.AbstractTracerContext;
-import org.apache.skywalking.apm.agent.core.context.ContextManagerExtendService;
+import org.apache.skywalking.apm.agent.core.meter.MeterService;
+import org.apache.skywalking.apm.agent.core.meter.transform.MeterTransformer;
/**
- * ZipkinContextManager used Brave APIs to manage the Zipkin tracing context, including span start/stop/tag/log,
- * inject/extract in across process, and capture/continue in across thread.
+ * MeterServiceBlocker blocks the original implementation.
*/
-@OverrideImplementor(ContextManagerExtendService.class)
-public class ZipkinContextManager extends ContextManagerExtendService {
- private ZipkinTraceReporter zipkinTraceReporter;
+@OverrideImplementor(MeterService.class)
+public class MeterServiceBlocker extends MeterService {
+ @Override
+ public <T extends MeterTransformer> void register(final T meterTransformer) {
+ }
+
+ @Override
+ public void prepare() throws Throwable {
+ }
@Override
- public void prepare() {
- zipkinTraceReporter = ServiceManager.INSTANCE.findService(ZipkinTraceReporter.class);
+ public void boot() throws Throwable {
}
- /**
- * Create AbstractTracerContext with as all new Zipkin tracer.
- */
@Override
- public AbstractTracerContext createTraceContext(final String operationName, final boolean forceSampling) {
- return new ZipkinTracerContext(zipkinTraceReporter.getTracing());
+ public void shutdown() throws Throwable {
}
}
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ProfileTaskChannelServiceBlocker.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ProfileTaskChannelServiceBlocker.java
new file mode 100644
index 0000000..a4b339b
--- /dev/null
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ProfileTaskChannelServiceBlocker.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.skywalking.apm.plugin.reporter.zipkin;
+
+import org.apache.skywalking.apm.agent.core.profile.ProfileTaskChannelService;
+
+/**
+ * ProfileTaskChannelServiceBlocker blocks the original implementation.
+ */
+public class ProfileTaskChannelServiceBlocker extends ProfileTaskChannelService {
+ @Override
+ public void prepare() {
+ }
+
+ @Override
+ public void boot() {
+ }
+
+ @Override
+ public void shutdown() {
+ }
+}
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ProfileTaskExecutionServiceBlocker.java
similarity index 51%
copy from apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
copy to apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ProfileTaskExecutionServiceBlocker.java
index eb22db6..894b6f4 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ProfileTaskExecutionServiceBlocker.java
@@ -19,28 +19,22 @@
package org.apache.skywalking.apm.plugin.reporter.zipkin;
import org.apache.skywalking.apm.agent.core.boot.OverrideImplementor;
-import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
-import org.apache.skywalking.apm.agent.core.context.AbstractTracerContext;
-import org.apache.skywalking.apm.agent.core.context.ContextManagerExtendService;
+import org.apache.skywalking.apm.agent.core.profile.ProfileTaskExecutionService;
/**
- * ZipkinContextManager used Brave APIs to manage the Zipkin tracing context, including span start/stop/tag/log,
- * inject/extract in across process, and capture/continue in across thread.
+ * ProfileTaskExecutionServiceBlocker blocks the original implementation.
*/
-@OverrideImplementor(ContextManagerExtendService.class)
-public class ZipkinContextManager extends ContextManagerExtendService {
- private ZipkinTraceReporter zipkinTraceReporter;
-
+@OverrideImplementor(ProfileTaskExecutionService.class)
+public class ProfileTaskExecutionServiceBlocker extends ProfileTaskExecutionService {
@Override
public void prepare() {
- zipkinTraceReporter = ServiceManager.INSTANCE.findService(ZipkinTraceReporter.class);
}
- /**
- * Create AbstractTracerContext with as all new Zipkin tracer.
- */
@Override
- public AbstractTracerContext createTraceContext(final String operationName, final boolean forceSampling) {
- return new ZipkinTracerContext(zipkinTraceReporter.getTracing());
+ public void boot() {
+ }
+
+ @Override
+ public void shutdown() {
}
}
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ServiceManagementClientBlocker.java
similarity index 51%
copy from apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
copy to apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ServiceManagementClientBlocker.java
index eb22db6..478b25f 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ServiceManagementClientBlocker.java
@@ -19,28 +19,22 @@
package org.apache.skywalking.apm.plugin.reporter.zipkin;
import org.apache.skywalking.apm.agent.core.boot.OverrideImplementor;
-import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
-import org.apache.skywalking.apm.agent.core.context.AbstractTracerContext;
-import org.apache.skywalking.apm.agent.core.context.ContextManagerExtendService;
+import org.apache.skywalking.apm.agent.core.remote.ServiceManagementClient;
/**
- * ZipkinContextManager used Brave APIs to manage the Zipkin tracing context, including span start/stop/tag/log,
- * inject/extract in across process, and capture/continue in across thread.
+ * ServiceManagementClientBlocker blocks the original implementation.
*/
-@OverrideImplementor(ContextManagerExtendService.class)
-public class ZipkinContextManager extends ContextManagerExtendService {
- private ZipkinTraceReporter zipkinTraceReporter;
-
+@OverrideImplementor(ServiceManagementClient.class)
+public class ServiceManagementClientBlocker extends ServiceManagementClient {
@Override
public void prepare() {
- zipkinTraceReporter = ServiceManager.INSTANCE.findService(ZipkinTraceReporter.class);
}
- /**
- * Create AbstractTracerContext with as all new Zipkin tracer.
- */
@Override
- public AbstractTracerContext createTraceContext(final String operationName, final boolean forceSampling) {
- return new ZipkinTracerContext(zipkinTraceReporter.getTracing());
+ public void boot() {
+ }
+
+ @Override
+ public void shutdown() {
}
}
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
index eb22db6..80eafcd 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinContextManager.java
@@ -41,6 +41,6 @@ public class ZipkinContextManager extends ContextManagerExtendService {
*/
@Override
public AbstractTracerContext createTraceContext(final String operationName, final boolean forceSampling) {
- return new ZipkinTracerContext(zipkinTraceReporter.getTracing());
+ return new ZipkinTracerContext(zipkinTraceReporter.getTracing(), zipkinTraceReporter.getCurrentTraceContext());
}
}
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinTraceReporter.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinTraceReporter.java
index 7081a17..8d2bf3c 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinTraceReporter.java
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinTraceReporter.java
@@ -19,10 +19,11 @@
package org.apache.skywalking.apm.plugin.reporter.zipkin;
import brave.Tracing;
+import brave.propagation.CurrentTraceContext;
+import brave.propagation.ThreadLocalCurrentTraceContext;
import lombok.Getter;
import org.apache.skywalking.apm.agent.core.boot.OverrideImplementor;
import org.apache.skywalking.apm.agent.core.conf.Config;
-import org.apache.skywalking.apm.agent.core.context.ContextCarrier;
import org.apache.skywalking.apm.agent.core.remote.TraceSegmentServiceClient;
import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
import zipkin2.reporter.okhttp3.OkHttpSender;
@@ -35,6 +36,8 @@ import zipkin2.reporter.okhttp3.OkHttpSender;
public class ZipkinTraceReporter extends TraceSegmentServiceClient {
@Getter
private Tracing tracing;
+ @Getter
+ private ThreadLocalCurrentTraceContext currentTraceContext;
private OkHttpSender sender;
private AsyncZipkinSpanHandler zipkinSpanHandler;
@@ -50,9 +53,11 @@ public class ZipkinTraceReporter extends TraceSegmentServiceClient {
public void boot() {
sender = OkHttpSender.create(Config.Collector.BACKEND_SERVICE);
zipkinSpanHandler = AsyncZipkinSpanHandler.create(sender);
+ currentTraceContext = (ThreadLocalCurrentTraceContext) CurrentTraceContext.Default.create();
// Create a tracing component with the service name you want to see in Zipkin.
tracing = Tracing.newBuilder()
+ .currentTraceContext(currentTraceContext)
.localServiceName(Config.Agent.SERVICE_NAME)
.addSpanHandler(zipkinSpanHandler)
.build();
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinTracerContext.java b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinTracerContext.java
index 4b9c01c..00743e0 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinTracerContext.java
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/java/org/apache/skywalking/apm/plugin/reporter/zipkin/ZipkinTracerContext.java
@@ -21,6 +21,7 @@ package org.apache.skywalking.apm.plugin.reporter.zipkin;
import brave.Span;
import brave.Tracer;
import brave.Tracing;
+import brave.propagation.ThreadLocalCurrentTraceContext;
import brave.propagation.TraceContext;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -43,12 +44,14 @@ public class ZipkinTracerContext implements AbstractTracerContext {
*/
private Map<Span, ZipkinSpan> runningSpans;
private final Tracing tracing;
+ private final ThreadLocalCurrentTraceContext currentTraceContext;
private final Tracer tracer;
private final CorrelationContext correlationContext;
- public ZipkinTracerContext(final Tracing tracing) {
+ public ZipkinTracerContext(final Tracing tracing, final ThreadLocalCurrentTraceContext currentTraceContext) {
this.tracing = tracing;
this.tracer = tracing.tracer();
+ this.currentTraceContext = currentTraceContext;
runningSpans = new ConcurrentHashMap<>();
this.correlationContext = new CorrelationContext();
}
@@ -127,7 +130,11 @@ public class ZipkinTracerContext implements AbstractTracerContext {
zipkinSpan.stop();
}
runningSpans.remove(span);
- return runningSpans.isEmpty();
+ boolean isContextFinished = runningSpans.isEmpty();
+ if (isContextFinished) {
+ currentTraceContext.clear();
+ }
+ return isContextFinished;
}
@Override
diff --git a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService
index e28a93a..e644c8f 100644
--- a/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService
+++ b/apm-sniffer/optional-reporter-plugins/zipkin-reporter-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService
@@ -19,12 +19,10 @@
org.apache.skywalking.apm.plugin.reporter.zipkin.ZipkinTraceReporter
org.apache.skywalking.apm.plugin.reporter.zipkin.ZipkinContextManager
org.apache.skywalking.apm.plugin.reporter.zipkin.GRPCBlockingService
-
-#org.apache.skywalking.apm.agent.core.jvm.JVMService
-#org.apache.skywalking.apm.agent.core.remote.ServiceManagementClient
-#org.apache.skywalking.apm.agent.core.context.ContextManagerExtendService
-#org.apache.skywalking.apm.agent.core.commands.CommandService
-#org.apache.skywalking.apm.agent.core.commands.CommandExecutorService
-#org.apache.skywalking.apm.agent.core.profile.ProfileTaskChannelService
-#org.apache.skywalking.apm.agent.core.profile.ProfileTaskExecutionService
-#org.apache.skywalking.apm.agent.core.meter.MeterService
\ No newline at end of file
+org.apache.skywalking.apm.plugin.reporter.zipkin.JVMBlockingService
+org.apache.skywalking.apm.plugin.reporter.zipkin.ServiceManagementClientBlocker
+org.apache.skywalking.apm.plugin.reporter.zipkin.CommandServiceBlocker
+org.apache.skywalking.apm.plugin.reporter.zipkin.CommandExecutorServiceBlocker
+org.apache.skywalking.apm.plugin.reporter.zipkin.ProfileTaskChannelServiceBlocker
+org.apache.skywalking.apm.plugin.reporter.zipkin.ProfileTaskExecutionServiceBlocker
+org.apache.skywalking.apm.plugin.reporter.zipkin.MeterServiceBlocker
\ No newline at end of file