Skip to content

Report effective AppSec state in app-started telemetry #12741

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

Merged
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Oct 19, 2026
Merged

Report effective AppSec state in app-started telemetry #12741

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: 3 additions & 2 deletions telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import datadog.trace.api.ConfigSetting;
import datadog.trace.api.DDTags;
import datadog.trace.api.InstrumenterConfig;
import datadog.trace.api.ProductActivation;
import datadog.trace.api.telemetry.Endpoint;
import datadog.trace.api.telemetry.ProductChange;
import datadog.trace.api.telemetry.ProductChange.ProductType;
import datadog.trace.bootstrap.ActiveSubsystems;
import datadog.trace.config.inversion.ConfigHelper;
import java.io.IOException;
import java.util.EnumMap;
Expand Down Expand Up @@ -112,8 +112,9 @@ public void writeConfigurations() {

public void writeProducts() {
try {
// Effective AppSec state: AppSec starts before telemetry (see Agent), so it is already set
requestBody.writeProducts(
InstrumenterConfig.get().getAppSecActivation() != ProductActivation.FULLY_DISABLED,
ActiveSubsystems.APPSEC_ACTIVE,
InstrumenterConfig.get().isProfilingEnabled(),
Config.get().isDynamicInstrumentationEnabled());
} catch (IOException e) {
Expand Down
39 changes: 29 additions & 10 deletions telemetry/src/test/java/datadog/telemetry/TelemetryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,16 @@
import datadog.trace.api.config.ProfilingConfig;
import datadog.trace.api.telemetry.Endpoint;
import datadog.trace.api.telemetry.ProductChange;
import datadog.trace.bootstrap.ActiveSubsystems;
import datadog.trace.test.junit.utils.config.WithConfigExtension;
import datadog.trace.util.ConfigStrings;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.tabletest.junit.TableTest;
Expand Down Expand Up @@ -93,6 +96,19 @@ class TelemetryServiceTest {
.responseCode(singletonList(200))
.authentication(singletonList("JWT"));

private boolean previousAppSecActive;

@BeforeEach
void setUp() {
previousAppSecActive = ActiveSubsystems.APPSEC_ACTIVE;
ActiveSubsystems.APPSEC_ACTIVE = false;
}

@AfterEach
void tearDown() {
ActiveSubsystems.APPSEC_ACTIVE = previousAppSecActive;
}

@Test
void happyPathWithoutData() throws IOException {
TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
Expand Down Expand Up @@ -646,17 +662,19 @@ void appStartedMustHaveInstallSignature(String installId, String installType, St
}

@TableTest({
"scenario | appsecConfig | appsecEnabled | profilingConfig | profilingEnabled | dynInstrConfig | dynInstrEnabled",
"all products enabled | 1 | true | 1 | true | 1 | true ",
"dynamic instrumentation disabled | 1 | true | 1 | true | 0 | false ",
"profiling disabled | 1 | true | 0 | false | 1 | true ",
"profiling and dyn instr disabled | 1 | true | 0 | false | 0 | false ",
"all products disabled | 0 | false | 0 | false | 0 | false ",
"appsec inactive value treated enabled | inactive | true | 0 | false | 0 | false "
"scenario | appsecConfig | appsecActive | profilingConfig | profilingEnabled | dynInstrConfig | dynInstrEnabled",
"all products enabled | 1 | true | 1 | true | 1 | true ",
"dynamic instrumentation disabled | 1 | true | 1 | true | 0 | false ",
"profiling disabled | 1 | true | 0 | false | 1 | true ",
"profiling and dyn instr disabled | 1 | true | 0 | false | 0 | false ",
"all products disabled | 0 | false | 0 | false | 0 | false ",
"appsec inactive not activated | inactive | false | 0 | false | 0 | false ",
"appsec inactive activated by RC | inactive | true | 0 | false | 0 | false ",
"appsec enabled but startup failed | 1 | false | 0 | false | 0 | false "
})
void appStartedMustIncludeActivatedProductsInfo(
String appsecConfig,
boolean appsecEnabled,
boolean appsecActive,
String profilingConfig,
boolean profilingEnabled,
String dynInstrConfig,
Expand All @@ -668,6 +686,7 @@ void appStartedMustIncludeActivatedProductsInfo(
ConfigStrings.toEnvVar(ProfilingConfig.PROFILING_ENABLED), profilingConfig);
WithConfigExtension.injectEnvConfig(
ConfigStrings.toEnvVar(DebuggerConfig.DYNAMIC_INSTRUMENTATION_ENABLED), dynInstrConfig);
ActiveSubsystems.APPSEC_ACTIVE = appsecActive;

TestTelemetryRouter testHttpClient = new TestTelemetryRouter();
TelemetryService telemetryService = new TelemetryService(testHttpClient, 10000, false);
Expand All @@ -676,11 +695,11 @@ void appStartedMustIncludeActivatedProductsInfo(
testHttpClient.expectRequest(SUCCESS);
telemetryService.sendAppStartedEvent();

// app-started
// app-started reports the effective AppSec state, not the configured activation
testHttpClient
.assertRequestBody(APP_STARTED)
.assertPayload()
.products(appsecEnabled, profilingEnabled, dynInstrEnabled);
.products(appsecActive, profilingEnabled, dynInstrEnabled);
testHttpClient.assertNoMoreRequests();
}
}
2 changes: 1 addition & 1 deletion telemetry/src/test/java/datadog/telemetry/TestTelemetryRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ PayloadAssertions endpoint(Endpoint... endpoints) {
}

PayloadAssertions products() {
return products(true, false, false);
return products(false, false, false);
}

PayloadAssertions products(boolean appsecEnabled) {
Expand Down
Loading