diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java index d7529cbea8e..ca368998c25 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java @@ -12,16 +12,17 @@ class ProcessImplStartAdvice { public static AgentSpan beforeStart( @Advice.Argument(0) final String[] command, @Advice.Argument(1) final Map environment) { + + if (!AgentTracer.isRegistered()) { + return null; + } + String rootSessionId = Config.get().getRootSessionId(); if (rootSessionId != null && environment != null) { environment.put("_DD_ROOT_JAVA_SESSION_ID", rootSessionId); } - if (!ProcessImplInstrumentationHelpers.ONLINE) { - return null; - } - - if (command.length == 0 || !AgentTracer.isRegistered()) { + if (!ProcessImplInstrumentationHelpers.ONLINE || command.length == 0) { return null; }