logging

Author: mhlidd

dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java

@@ -131,6 +131,7 @@ public static ContextScope onService(@Advice.Argument(0) org.apache.coyote.Reque
 
       final AgentSpan span = DECORATE.startSpanFromContext("http-server", req, extractedContext);
       final ContextScope scope = extractedContext.with(span).attach();
+//      final ContextScope scope = activateSpan(span);
       // This span is finished when Request.recycle() is called by RequestInstrumentation.
       DECORATE.afterStart(span);
 

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy

@@ -1041,7 +1041,8 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
     if (isDataStreamsEnabled()) {
       TEST_DATA_STREAMS_WRITER.waitForGroups(1)
     }
-
+    println(request)
+    println(response)
     expect:
     if (bubblesResponse()) {
       assert response.code() == REDIRECT.status

dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java

@@ -36,6 +36,8 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
+
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -122,6 +124,7 @@ private AgentScope.Continuation captureSpan(Context context, byte source, AgentS
     return new ScopeContinuation(this, context, source, traceCollector).register();
   }
 
+  @SuppressForbidden
   private AgentScope activate(
       final AgentSpan span,
       final byte source,
@@ -155,12 +158,20 @@ private AgentScope activate(
 
     final ContinuableScope scope =
         new ContinuableScope(this, context, source, asyncPropagation, createScopeState(context));
+    System.out.println("Scope size prior: " + scopeStack.depth());
     scopeStack.push(scope);
+    System.out.println("Scope size prior: " + scopeStack.depth());
     healthMetrics.onActivateScope();
 
+    if (iterationKeepAlive > 0 && currentDepth == 0) {
+      // For context-based scopes, only add them if they're going to be long-lived
+      scheduleRootIterationScopeCleanup(scopeStack, scope);
+    }
+
     return scope;
   }
 
+  @SuppressForbidden
   private AgentScope activate(final Context context) {
     ScopeStack scopeStack = scopeStack();
 
@@ -185,9 +196,17 @@ private AgentScope activate(final Context context) {
 
     final ContinuableScope scope =
         new ContinuableScope(this, context, CONTEXT, asyncPropagation, createScopeState(context));
+    System.out.println("Context: " + context);
+    System.out.println("Scope size prior: " + scopeStack.depth());
     scopeStack.push(scope);
+    System.out.println("Scope size prior: " + scopeStack.depth());
     healthMetrics.onActivateScope();
 
+    if (iterationKeepAlive > 0 && currentDepth == 0) {
+      // For context-based scopes, only add them if they're going to be long-lived
+      scheduleRootIterationScopeCleanup(scopeStack, scope);
+    }
+
     return scope;
   }
 
@@ -304,8 +323,13 @@ public void rollbackActiveToCheckpoint() {
     }
   }
 
+  @SuppressForbidden
   public AgentSpan activeSpan() {
     final ContinuableScope active = scopeStack().active();
+
+    System.out.println("Scope size prior: " + scopeStack().depth());
+    System.out.println("scopeStack(): " + scopeStack());
+    System.out.println("active: " + active);
     return active == null ? null : active.span();
   }