You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/04/24 03:39:18 UTC
[incubator-skywalking] branch refactor/agent updated: Fix CI.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch refactor/agent
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/refactor/agent by this push:
new 0c3d463 Fix CI.
0c3d463 is described below
commit 0c3d463ae53dadef1922810589aef2e50bcb6a14
Author: wusheng <wu...@foxmail.com>
AuthorDate: Tue Apr 24 11:39:10 2018 +0800
Fix CI.
---
.../apache/skywalking/apm/agent/core/context/ContextManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
index aab365a..61e1e9d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
@@ -42,12 +42,12 @@ import org.apache.skywalking.apm.util.StringUtil;
public class ContextManager implements TracingContextListener, BootService, IgnoreTracerContextListener {
private static final ILog logger = LogManager.getLogger(ContextManager.class);
private static ThreadLocal<AbstractTracerContext> CONTEXT = new ThreadLocal<AbstractTracerContext>();
- private static ContextManagerExtendService service;
+ private static ContextManagerExtendService EXTEND_SERVICE;
private static AbstractTracerContext getOrCreate(String operationName, boolean forceSampling) {
AbstractTracerContext context = CONTEXT.get();
- if (service == null) {
- service = ServiceManager.INSTANCE.findService(ContextManagerExtendService.class);
+ if (EXTEND_SERVICE == null) {
+ EXTEND_SERVICE = ServiceManager.INSTANCE.findService(ContextManagerExtendService.class);
}
if (context == null) {
if (StringUtil.isEmpty(operationName)) {
@@ -59,7 +59,7 @@ public class ContextManager implements TracingContextListener, BootService, Igno
if (RemoteDownstreamConfig.Agent.APPLICATION_ID != DictionaryUtil.nullValue()
&& RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID != DictionaryUtil.nullValue()
) {
- context = service.createTraceContext(operationName, forceSampling);
+ context = EXTEND_SERVICE.createTraceContext(operationName, forceSampling);
} else {
/**
* Can't register to collector, no need to trace anything.
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.