Skip to content

Force manual keep of traces for AI Guard #10625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smola wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −0
Open

Force manual keep of traces for AI Guard #10625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.squareup.moshi.Types;
import datadog.communication.http.OkHttpUtils;
import datadog.trace.api.Config;
import datadog.trace.api.DDTags;
import datadog.trace.api.aiguard.AIGuard;
import datadog.trace.api.aiguard.AIGuard.AIGuardAbortError;
import datadog.trace.api.aiguard.AIGuard.AIGuardClientError;
Expand Down Expand Up @@ -218,6 +219,10 @@ public Evaluation evaluate(final List<Message> messages, final Options options)
builder.asChildOf(parent.context());
}
final AgentSpan span = builder.start();
final AgentSpan localRootSpan = span.getLocalRootSpan();
if (localRootSpan != null) {
localRootSpan.setTag(DDTags.MANUAL_KEEP, true);
}
try (final AgentScope scope = tracer.activateSpan(span)) {
final Message last = messages.get(messages.size() - 1);
if (isToolCall(last)) {
Expand Down
5 changes: 5 additions & 0 deletions dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.squareup.moshi.Moshi
import datadog.common.version.VersionInfo
import datadog.trace.api.Config
import datadog.trace.api.DDTags
import datadog.trace.api.aiguard.AIGuard
import datadog.trace.api.telemetry.WafMetricCollector
import datadog.trace.bootstrap.instrumentation.api.AgentSpan
Expand Down Expand Up @@ -72,12 +73,15 @@ class AIGuardInternalTests extends DDSpecification {
protected static final PROMPT = TOOL_OUTPUT + [AIGuard.Message.message('assistant', '2 + 2 is 5'), AIGuard.Message.message('user', '')]

protected AgentSpan span
protected AgentSpan localRootSpan

void setup() {
injectEnvConfig('SERVICE', 'ai_guard_test')
injectEnvConfig('ENV', 'test')

span = Mock(AgentSpan)
localRootSpan = Mock(AgentSpan)
span.getLocalRootSpan() >> localRootSpan
final builder = Mock(AgentTracer.SpanBuilder) {
start() >> span
}
Expand Down Expand Up @@ -185,6 +189,7 @@ class AIGuardInternalTests extends DDSpecification {

then:
1 * span.setTag(AIGuardInternal.TARGET_TAG, suite.target)
1 * localRootSpan.setTag(DDTags.MANUAL_KEEP, true)
if (suite.target == 'tool') {
1 * span.setTag(AIGuardInternal.TOOL_TAG, 'calc')
}
Expand Down
6 changes: 6 additions & 0 deletions ...-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/AIGuardSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,15 @@ class AIGuardSmokeTest extends AbstractAppSecServerSmokeTest {
?.find {
it.resource == 'ai_guard'
} as DecodedSpan
final rootSpan = traces*.spans
?.flatten()
?.find {
it.traceId == span.traceId && it.parentId == 0
} as DecodedSpan
assert span.meta.get('ai_guard.action') == action
assert span.meta.get('ai_guard.reason') == reason
assert span.meta.get('ai_guard.target') == 'prompt'
assert rootSpan.metrics.get('_sampling_priority_v1') == 2
final messages = span.metaStruct.get('ai_guard').messages as List<Map<String, Object>>
assert messages.size() == 2
with(messages[0]) {
Expand Down