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
@@ -1,6 +1,8 @@
package com.datadog.aiguard;

import static datadog.communication.ddagent.TracerVersion.TRACER_VERSION;
import static datadog.context.Context.isCaptureEnabled;
import static datadog.context.Context.setCaptureEnabled;
import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardTruncationType.CONTENT;
import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardTruncationType.MESSAGES;
import static datadog.trace.util.Strings.isBlank;
Expand Down Expand Up @@ -365,7 +367,7 @@ public Evaluation evaluate(final List<Message> messages, final Options options)
.url(url)
.method("POST", new MoshiJsonRequestBody(moshi, messages, meta));
headers.forEach(request::header);
try (final Response response = executeRequest(tracer, request.build())) {
try (final Response response = executeRequest(request.build())) {
final Map<String, Object> result;
try {
result = parseResponseBody(response);
Expand Down Expand Up @@ -456,15 +458,14 @@ public Evaluation evaluate(final List<Message> messages, final Options options)
}
}

private Response executeRequest(final AgentTracer.TracerAPI tracer, final Request request)
throws IOException {
final boolean asyncPropagation = tracer.isAsyncPropagationEnabled();
private Response executeRequest(final Request request) throws IOException {
final boolean captureEnabled = isCaptureEnabled();
try {
// The synchronous HTTP call must not pass its context to pool maintenance threads.
tracer.setAsyncPropagationEnabled(false);
setCaptureEnabled(false);
return client.newCall(request).execute();
} finally {
tracer.setAsyncPropagationEnabled(asyncPropagation);
setCaptureEnabled(captureEnabled);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.datadog.aiguard;

import static datadog.context.Context.isCaptureEnabled;
import static datadog.context.Context.setCaptureEnabled;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonList;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -80,7 +82,7 @@ void isolatesHttpWorkAndRestoresCaller(
DDSpan span = (DDSpan) tracer.activeSpan();
assertEquals(
scopeDepthLimit == 1 ? "parent" : "ai_guard", span.getOperationName().toString());
assertFalse(tracer.isAsyncPropagationEnabled());
assertFalse(isCaptureEnabled());
if (outcome == Outcome.ERROR) {
throw new IOException("Transport failed");
}
Expand All @@ -102,7 +104,7 @@ void isolatesHttpWorkAndRestoresCaller(
List<AIGuard.Message> messages = singletonList(AIGuard.Message.message("user", "Hello"));
AgentSpan parent = tracer.startSpan("test", "parent");
try (ContextScope ignored = tracer.activateSpan(parent)) {
tracer.setAsyncPropagationEnabled(callerPropagation);
setCaptureEnabled(callerPropagation);
if (outcome == Outcome.ERROR) {
assertThrows(
AIGuard.AIGuardClientError.class,
Expand All @@ -117,7 +119,7 @@ void isolatesHttpWorkAndRestoresCaller(
evaluator.evaluate(messages, AIGuard.Options.DEFAULT).getAction());
}
assertSame(parent, tracer.activeSpan());
assertEquals(callerPropagation, tracer.isAsyncPropagationEnabled());
assertEquals(callerPropagation, isCaptureEnabled());
verify(call).execute();
} finally {
parent.finish();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package datadog.trace.bootstrap.instrumentation.java.concurrent;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled;
import static datadog.context.Context.isCaptureEnabled;

import datadog.context.Context;
import datadog.context.ContextContinuation;
Expand Down Expand Up @@ -68,7 +68,7 @@ public static boolean shouldCapture(Context context) {
}
AgentSpan span = AgentSpan.fromContext(context);
// propagate contexts with no span or a valid span, when flag is on
return (span == null || span.isValid()) && isAsyncPropagationEnabled();
return (span == null || span.isValid()) && isCaptureEnabled();
}

public static <T> void capture(ContextStore<T, State> contextStore, T task) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import java.util.function.BiFunction
import java.util.function.Function
import java.util.function.Supplier

import static datadog.context.Context.isCaptureEnabled
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART_COMBINED
Expand Down Expand Up @@ -104,7 +105,6 @@ import static datadog.trace.api.config.TracerConfig.RESPONSE_HEADER_TAGS
import static datadog.trace.bootstrap.blocking.BlockingActionHelper.TemplateType.JSON
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.get
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan
import static java.nio.charset.StandardCharsets.UTF_8
import static org.junit.jupiter.api.Assumptions.assumeTrue
Expand Down Expand Up @@ -667,7 +667,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
static <T> T controller(ServerEndpoint endpoint, Closure<T> closure) {
assert activeSpan() != null: "Controller should have a parent span."
assert activeSpan() != noopSpan(): "Parent span shouldn't be noopSpan"
assert isAsyncPropagationEnabled(): "Span should be propagating async."
assert isCaptureEnabled(): "Span should be propagating async."
if (endpoint == NOT_FOUND || endpoint == UNKNOWN) {
return closure()
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import datadog.context.Context.setCaptureEnabled
import java.util.concurrent.Semaphore
import akka.actor.{Actor, ActorLogging, ActorRef, ActorSystem, Props}
import akka.pattern.ask
import akka.routing.RoundRobinPool
import akka.util.Timeout
import datadog.trace.api.Trace
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{
activateSpan,
setAsyncPropagationEnabled,
activeSpan,
startSpan
}
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activateSpan, activeSpan, startSpan}

import scala.concurrent.Await
import scala.concurrent.duration._
Expand Down Expand Up @@ -58,7 +54,7 @@ class AkkaActors extends AutoCloseable {
@Trace
def send(name: String, who: String): Unit = {
val actor = actors(name)
setAsyncPropagationEnabled(true)
setCaptureEnabled(true)
activeSpan().setSpanName(name)
actor ! WhoToGreet(who)
if (name == "ask") {
Expand All @@ -70,7 +66,7 @@ class AkkaActors extends AutoCloseable {

@Trace
def leak(who: String, leak: String): Unit = {
setAsyncPropagationEnabled(true)
setCaptureEnabled(true)
activeSpan().setSpanName("leak all the things")
tellGreeter ! WhoToGreet(who)
tellGreeter ! Leak(leak)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import spock.util.concurrent.PollingConditions

import java.util.concurrent.TimeUnit

import static datadog.context.Context.isCaptureEnabled
import static datadog.context.Context.setCaptureEnabled
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled

class AkkaHttpTimeoutCleanupTest extends InstrumentationSpecification {

Expand Down Expand Up @@ -41,9 +41,9 @@ class AkkaHttpTimeoutCleanupTest extends InstrumentationSpecification {

when:
runUnderTrace('request') {
setAsyncPropagationEnabled(enabled)
setCaptureEnabled(enabled)
clear.invoke(access)
assert isAsyncPropagationEnabled() == enabled
assert isCaptureEnabled() == enabled
}

then:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import static datadog.context.Context.isCaptureEnabled

import com.linecorp.armeria.client.Clients
import com.linecorp.armeria.common.SessionProtocol
import com.linecorp.armeria.common.grpc.GrpcSerializationFormats
Expand Down Expand Up @@ -75,7 +77,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
serverReceived << value.message

(1..msgCount).each {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
observer.onNext(value)
} else {
observer.onError(new IllegalStateException("not async propagating!"))
Expand All @@ -85,7 +87,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {

@Override
void onError(Throwable t) {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
error.set(t)
observer.onError(t)
} else {
Expand All @@ -95,7 +97,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {

@Override
void onCompleted() {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
observer.onCompleted()
} else {
observer.onError(new IllegalStateException("not async propagating!"))
Expand All @@ -118,7 +120,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
def streamObserver = client.conversation(new StreamObserver<Helloworld.Response>() {
@Override
void onNext(Helloworld.Response value) {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
clientReceived << value.message
} else {
error.set(new IllegalStateException("not async propagating!"))
Expand All @@ -127,7 +129,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {

@Override
void onError(Throwable t) {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
error.set(t)
} else {
error.set(new IllegalStateException("not async propagating!"))
Expand All @@ -136,7 +138,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {

@Override
void onCompleted() {
if (!TEST_TRACER.isAsyncPropagationEnabled()) {
if (!isCaptureEnabled()) {
error.set(new IllegalStateException("not async propagating!"))
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import static datadog.context.Context.isCaptureEnabled

import com.google.common.util.concurrent.MoreExecutors
import datadog.trace.agent.test.naming.VersionedNamingTestBase
import datadog.trace.api.DDSpanTypes
Expand Down Expand Up @@ -68,7 +70,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
serverReceived << value.message

(1..msgCount).each {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
observer.onNext(value)
} else {
observer.onError(new IllegalStateException("not async propagating!"))
Expand All @@ -78,7 +80,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {

@Override
void onError(Throwable t) {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
error.set(t)
observer.onError(t)
} else {
Expand All @@ -88,7 +90,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {

@Override
void onCompleted() {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
observer.onCompleted()
} else {
observer.onError(new IllegalStateException("not async propagating!"))
Expand All @@ -108,7 +110,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
def streamObserver = client.conversation(new StreamObserver<Helloworld.Response>() {
@Override
void onNext(Helloworld.Response value) {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
clientReceived << value.message
} else {
error.set(new IllegalStateException("not async propagating!"))
Expand All @@ -117,7 +119,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {

@Override
void onError(Throwable t) {
if (TEST_TRACER.isAsyncPropagationEnabled()) {
if (isCaptureEnabled()) {
error.set(t)
} else {
error.set(new IllegalStateException("not async propagating!"))
Expand All @@ -126,7 +128,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {

@Override
void onCompleted() {
if (!TEST_TRACER.isAsyncPropagationEnabled()) {
if (!isCaptureEnabled()) {
error.set(new IllegalStateException("not async propagating!"))
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith;
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.isContextCaptureEnabled;
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.setContextCaptureEnabled;
import static datadog.trace.instrumentation.java.concurrent.ConcurrentInstrumentationNames.EXECUTOR_INSTRUMENTATION_NAME;
import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy;
import static net.bytebuddy.matcher.ElementMatchers.isTypeInitializer;
Expand Down Expand Up @@ -276,8 +276,8 @@ public static class DisableAsyncAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
public static boolean before() {
if (isAsyncPropagationEnabled()) {
setAsyncPropagationEnabled(false);
if (isContextCaptureEnabled()) {
setContextCaptureEnabled(false);
return true;
}
return false;
Expand All @@ -286,7 +286,7 @@ public static boolean before() {
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void after(@Advice.Enter boolean wasDisabled) {
if (wasDisabled) {
setAsyncPropagationEnabled(true);
setContextCaptureEnabled(true);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package testdog.trace.instrumentation.java.concurrent;

import static datadog.context.Context.current;
import static datadog.context.Context.isCaptureEnabled;
import static datadog.context.Context.setCaptureEnabled;
import static datadog.trace.agent.test.assertions.SpanMatcher.span;
import static datadog.trace.agent.test.assertions.TraceMatcher.SORT_BY_START_TIME;
import static datadog.trace.agent.test.assertions.TraceMatcher.trace;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
Expand Down Expand Up @@ -348,12 +348,12 @@ void disabledPropagationDoesNotCaptureParent() throws Exception {
try (ForkJoinPool pool = new ForkJoinPool(1)) {
AgentSpan parent = startSpan("test", "parent");
try (ContextScope ignored = current().with(parent).attach()) {
boolean enabled = isAsyncPropagationEnabled();
setAsyncPropagationEnabled(false);
boolean enabled = isCaptureEnabled();
setCaptureEnabled(false);
try {
pool.schedule(() -> assertNull(AgentSpan.current()), 0, MILLISECONDS).get(10, SECONDS);
} finally {
setAsyncPropagationEnabled(enabled);
setCaptureEnabled(enabled);
}
} finally {
parent.finish();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import spock.lang.Shared
import java.util.concurrent.LinkedBlockingQueue
import java.util.concurrent.TimeUnit

import static datadog.context.Context.isCaptureEnabled
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled

abstract class KafkaClientTestBase extends VersionedNamingTestBase {
static final SHARED_TOPIC = "shared.topic"
Expand Down Expand Up @@ -179,7 +179,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
String greeting = "Hello Spring Kafka Sender!"
runUnderTrace("parent") {
producer.send(new ProducerRecord(SHARED_TOPIC, greeting)) { meta, ex ->
assert isAsyncPropagationEnabled()
assert isCaptureEnabled()
if (ex == null) {
runUnderTrace("producer callback") {}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import datadog.trace.api.config.TraceInstrumentationConfig
import datadog.trace.api.config.TracerConfig
import datadog.trace.instrumentation.kafka_common.ClusterIdHolder

import static datadog.context.Context.isCaptureEnabled
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled

import datadog.trace.agent.test.InstrumentationSpecification
import datadog.trace.agent.test.asserts.TraceAssert
Expand Down Expand Up @@ -229,7 +229,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
String greeting = "Hello Spring Kafka Sender!"
runUnderTrace("parent") {
producer.send(new ProducerRecord(SHARED_TOPIC, greeting)) { meta, ex ->
assert isAsyncPropagationEnabled()
assert isCaptureEnabled()
if (ex == null) {
runUnderTrace("producer callback") {}
} else {
Expand Down
Loading
Loading