From f4ca4c8a6e3e59a0082f7cdafd3d772722a16547 Mon Sep 17 00:00:00 2001
From: qxo <49526356@qq.com>
Date: Sun, 21 Jul 2019 23:10:03 +0800
Subject: [PATCH] fixed for #3135:createEntrySpan should get SamplingService
 only if it required ( carrier is valid) (#3137)

---
 .../skywalking/apm/agent/core/context/ContextManager.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 90ffdb19a..206cb6845 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
@@ -87,10 +87,10 @@ public class ContextManager implements BootService {
     }
 
     public static AbstractSpan createEntrySpan(String operationName, ContextCarrier carrier) {
-        SamplingService samplingService = ServiceManager.INSTANCE.findService(SamplingService.class);
         AbstractSpan span;
         AbstractTracerContext context;
         if (carrier != null && carrier.isValid()) {
+            SamplingService samplingService = ServiceManager.INSTANCE.findService(SamplingService.class);
             samplingService.forceSampled();
             context = getOrCreate(operationName, true);
             span = context.createEntrySpan(operationName);