Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import static datadog.trace.agent.test.utils.TestAgentPort.parse
import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_SNAPSHOT_URL
import static datadog.trace.api.config.DebuggerConfig.DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE
import static datadog.trace.api.config.TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious
import static datadog.trace.util.AgentThreadFactory.AgentThread.TASK_SCHEDULER

import ch.qos.logback.classic.Level
Expand All @@ -25,6 +24,7 @@ import com.datadog.debugger.sink.DebuggerSink
import com.datadog.debugger.sink.ProbeStatusSink
import com.google.common.collect.Sets
import datadog.communication.ddagent.DDAgentFeaturesDiscovery
import datadog.context.Context
import datadog.instrument.classinject.ClassInjector
import datadog.metrics.agent.AgentMeter
import datadog.metrics.api.Monitoring
Expand All @@ -45,6 +45,7 @@ import datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers
import datadog.trace.agent.tooling.bytebuddy.matcher.GlobalIgnores
import datadog.trace.api.Config
import datadog.trace.api.IdGenerationStrategy
import datadog.trace.api.InstrumenterConfig
import datadog.trace.api.Pair
import datadog.trace.api.ProcessTags
import datadog.trace.api.TraceConfig
Expand Down Expand Up @@ -471,13 +472,12 @@ abstract class InstrumentationSpecification extends DDSpecification implements A

assertThreadsEachCleanup = false

closePrevious(true) // in case the previous test left a lingering iteration span
assert TEST_TRACER.activeSpan() == null: "Span is active before test has started: " + TEST_TRACER.activeSpan()

// Config is reset before each test. Thus, configurePreAgent() has to be called before each test
// even though the agent is already installed
configurePreAgent()

Context.root().swap()

println "Starting test: ${getSpecificationContext().getCurrentIteration().getName()} from ${specificationContext.currentSpec.name}"
TEST_TRACER.flush()

Expand Down Expand Up @@ -516,6 +516,10 @@ abstract class InstrumentationSpecification extends DDSpecification implements A

void cleanup() {
try {
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
TEST_TRACER.closePrevious(true) // finish the last iteration span before checking for leaks
}

if (isTestAgentEnabled()) {
// save Datadog environment to DDAgentWriter header
addEnvironmentVariablesToHeaders(TEST_AGENT_API)
Expand Down Expand Up @@ -553,6 +557,9 @@ abstract class InstrumentationSpecification extends DDSpecification implements A

// check for instrumentation issues while running each test
assert InstrumentationErrors.noErrors(): InstrumentationErrors.describeErrors()

final AgentSpan activeSpan = TEST_TRACER.activeSpan()
assert activeSpan == null: "Span is active after test has finished: " + activeSpan
} catch (Throwable cleanupFailure) {
if (scopeDiagnosticsFailure != null) {
cleanupFailure.addSuppressed(scopeDiagnosticsFailure)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package datadog.trace.instrumentation.akka.concurrent;

import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.checkpointActiveForRollback;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.rollbackActiveToCheckpoint;
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
Expand All @@ -15,6 +13,7 @@
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.InstrumenterConfig;
import datadog.trace.bootstrap.InstrumentationContext;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.bootstrap.instrumentation.java.concurrent.AdviceUtils;
import datadog.trace.bootstrap.instrumentation.java.concurrent.State;
import java.util.Map;
Expand Down Expand Up @@ -68,7 +67,7 @@ public static ContextHandle enter(

if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
// remember the currently active scope so we can roll back to this point
checkpointActiveForRollback();
AgentTracer.get().checkpointActiveForRollback();
return null;
} else {
return currentContext().swap();
Expand All @@ -80,10 +79,10 @@ public static void exit(
@Advice.Local("taskScope") ContextScope taskScope,
@Advice.Enter ContextHandle checkpointContext) {

if (checkpointContext == null) {
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
// Clean up any leaking scopes from akka-streams/akka-http etc.
rollbackActiveToCheckpoint();
} else {
AgentTracer.get().rollbackActiveToCheckpoint();
} else if (checkpointContext != null) {
checkpointContext.swap();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package datadog.trace.instrumentation.akka.concurrent;

import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.checkpointActiveForRollback;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.rollbackActiveToCheckpoint;
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;

Expand All @@ -11,6 +9,7 @@
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.InstrumenterConfig;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import net.bytebuddy.asm.Advice;

@AutoService(InstrumenterModule.class)
Expand Down Expand Up @@ -48,7 +47,7 @@ public static final class SuppressMailboxRunAdvice {
public static ContextHandle enter() {
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
// remember the currently active scope so we can roll back to this point
checkpointActiveForRollback();
AgentTracer.get().checkpointActiveForRollback();
return null;
} else {
return currentContext().swap();
Expand All @@ -57,10 +56,10 @@ public static ContextHandle enter() {

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void exit(@Advice.Enter final ContextHandle checkpointContext) {
if (checkpointContext == null) {
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
// Clean up any leaking scopes from akka-streams/akka-http etc.
rollbackActiveToCheckpoint();
} else {
AgentTracer.get().rollbackActiveToCheckpoint();
} else if (checkpointContext != null) {
checkpointContext.swap();
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package datadog.trace.instrumentation.akka.concurrent;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertTrue;

import datadog.context.Context;
import datadog.context.ContextScope;
import datadog.trace.agent.test.AbstractInstrumentationTest;
import datadog.trace.api.config.TraceInstrumentationConfig;
import datadog.trace.test.junit.utils.config.WithConfig;
import org.junit.jupiter.api.Test;

@WithConfig(key = TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, value = "false")
class ActorScopeCleanupForkedTest extends AbstractInstrumentationTest {

@Test
void actorExitClosesTaskScopeWhenEntryFailedBeforeSavingContext() {
RecordingScope taskScope = new RecordingScope();

assertDoesNotThrow(() -> AkkaActorCellInstrumentation.InvokeAdvice.exit(taskScope, null));

assertTrue(taskScope.closed);
}

@Test
void mailboxExitToleratesEntryFailureBeforeSavingContext() {
assertDoesNotThrow(() -> AkkaMailboxInstrumentation.SuppressMailboxRunAdvice.exit(null));
}

private static final class RecordingScope implements ContextScope {
private boolean closed;

@Override
public Context context() {
return Context.root();
}

@Override
public void close() {
closed = true;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import static datadog.trace.api.datastreams.DataStreamsTags.Direction.INBOUND;
import static datadog.trace.api.datastreams.DataStreamsTags.create;
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateNext;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName;
Expand Down Expand Up @@ -48,7 +46,7 @@ public boolean hasNext() {
if (!moreMessages) {
// no more messages, use this as a signal to close the last iteration scope
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(true);
AgentTracer.get().closePrevious(true);
} else {
final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
if (previousSpan != null) {
Expand All @@ -69,7 +67,7 @@ public Message next() {
protected void startNewMessageSpan(Message message) {
try {
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(true);
AgentTracer.get().closePrevious(true);
} else if (message == null) { // previous message span was the last
final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
if (previousSpan != null) {
Expand Down Expand Up @@ -116,7 +114,7 @@ protected void startNewMessageSpan(Message message) {
CONSUMER_DECORATE.afterStart(span);
CONSUMER_DECORATE.onConsume(span, queueUrl);
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
activateNext(span);
AgentTracer.get().activateNext(span);
} else {
final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
if (previousSpan != null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package datadog.trace.instrumentation.aws.v1.sqs;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;

import com.amazonaws.services.sqs.model.Message;
import datadog.context.Context;
import datadog.trace.api.InstrumenterConfig;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import java.util.ListIterator;

public class TracingListIterator extends TracingIterator<ListIterator<Message>>
Expand All @@ -21,7 +20,7 @@ public boolean hasPrevious() {
if (!moreMessages) {
// no more messages, use this as a signal to close the last iteration scope
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(true);
AgentTracer.get().closePrevious(true);
} else {
final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
if (previousSpan != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import static datadog.trace.api.datastreams.DataStreamsTags.Direction.INBOUND;
import static datadog.trace.api.datastreams.DataStreamsTags.create;
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateNext;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName;
Expand Down Expand Up @@ -52,7 +50,7 @@ public boolean hasNext() {
if (!moreMessages) {
// no more messages, use this as a signal to close the last iteration scope
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(true);
AgentTracer.get().closePrevious(true);
} else {
final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
if (previousSpan != null) {
Expand All @@ -73,7 +71,7 @@ public Message next() {
protected void startNewMessageSpan(Message message) {
try {
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(true);
AgentTracer.get().closePrevious(true);
} else if (message == null) { // previous message span was the last
final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
if (previousSpan != null) {
Expand Down Expand Up @@ -120,7 +118,7 @@ protected void startNewMessageSpan(Message message) {
CONSUMER_DECORATE.afterStart(span);
CONSUMER_DECORATE.onConsume(span, queueUrl, queueName, requestId);
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
activateNext(span);
AgentTracer.get().activateNext(span);
} else {
final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
if (previousSpan != null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package datadog.trace.instrumentation.aws.v2.sqs;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;

import datadog.context.Context;
import datadog.trace.api.InstrumenterConfig;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import java.util.ListIterator;
import software.amazon.awssdk.services.sqs.model.Message;

Expand All @@ -21,7 +20,7 @@ public boolean hasPrevious() {
if (!moreMessages) {
// no more messages, use this as a signal to close the last iteration scope
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(true);
AgentTracer.get().closePrevious(true);
} else {
final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
if (previousSpan != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import datadog.trace.api.config.TraceInstrumentationConfig;
import datadog.trace.api.config.TracerConfig;
import datadog.trace.api.naming.SpanNaming;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
import datadog.trace.bootstrap.instrumentation.api.Tags;
import datadog.trace.core.DDSpan;
Expand Down Expand Up @@ -596,7 +595,7 @@ static void stopSqsServer() {
@BeforeEach
void setUpAwsCredentials() {
if (closePreviousBeforeTest()) {
AgentTracer.closePrevious(true);
tracer.closePrevious(true);
}
System.setProperty(SdkSystemSetting.AWS_ACCESS_KEY_ID.property(), "my-access-key");
System.setProperty(SdkSystemSetting.AWS_SECRET_ACCESS_KEY.property(), "my-secret-key");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import static datadog.trace.api.datastreams.DataStreamsTags.Direction.INBOUND;
import static datadog.trace.api.datastreams.DataStreamsTags.create;
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateNext;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.rootContext;
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
Expand Down Expand Up @@ -94,7 +92,7 @@ public static MessageConsumerState beforeReceive(@Advice.This final MessageConsu

boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(finishSpan);
AgentTracer.get().closePrevious(finishSpan);
} else {
final AgentSpan previousSpan = spanFromContext(rootContext().swap());
if (previousSpan != null) {
Expand Down Expand Up @@ -175,7 +173,8 @@ public static void afterReceive(
CONSUMER_DECORATE.onError(span, throwable);

if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
activateNext(span); // scope is left open until next message or it times out
// scope is left open until next message or it times out
AgentTracer.get().activateNext(span);
} else {
final AgentSpan previousSpan = spanFromContext(span.swap());
if (previousSpan != null) {
Expand Down Expand Up @@ -207,7 +206,7 @@ public static void beforeClose(@Advice.This final MessageConsumer consumer) {
if (null != consumerState) {
boolean finishSpan = consumerState.getSessionState().isAutoAcknowledge();
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(finishSpan);
AgentTracer.get().closePrevious(finishSpan);
} else {
final AgentSpan previousSpan = spanFromContext(rootContext().swap());
if (previousSpan != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import static datadog.trace.api.datastreams.DataStreamsTags.create;
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.DSM_CONCERN;
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateNext;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.BROKER_DECORATE;
Expand Down Expand Up @@ -70,7 +68,7 @@ public boolean hasNext() {
if (!moreRecords) {
// no more records, use this as a signal to close the last iteration scope
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(true);
AgentTracer.get().closePrevious(true);
} else {
final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
if (previousSpan != null) {
Expand All @@ -91,7 +89,7 @@ public boolean hasNext() {
protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
try {
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
closePrevious(true);
AgentTracer.get().closePrevious(true);
} else if (val == null) { // previous message span was the last
final AgentSpan previousSpan = AgentSpan.fromContext(Context.root().swap());
if (previousSpan != null) {
Expand Down Expand Up @@ -157,7 +155,7 @@ protected void startNewRecordSpan(ConsumerRecord<?, ?> val) {
decorator.afterStart(span);
decorator.onConsume(span, val, group, clusterId, bootstrapServers);
if (InstrumenterConfig.get().isLegacyContextManagerEnabled()) {
activateNext(span);
AgentTracer.get().activateNext(span);
} else {
final AgentSpan previousSpan = AgentSpan.fromContext(span.swap());
if (previousSpan != null) {
Expand Down
Loading
Loading