Skip to content
Merged
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
8 changes: 7 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/internal-api/src/test/groovy/datadog/trace/api/sampling @DataDog/apm-sdk-api-java

# @DataDog/apm-serverless
/dd-trace-core/src/main/java/datadog/trace/lambda/ @DataDog/apm-serverless
/dd-trace-core/src/main/java/datadog/trace/lambda/ @DataDog/apm-serverless
/dd-trace-core/src/test/groovy/datadog/trace/lambda/ @DataDog/apm-serverless

# @DataDog/apm-lang-platform-java
Expand Down Expand Up @@ -131,3 +131,9 @@ dd-trace-api/src/main/java/datadog/trace/api/llmobs/ @DataDog/ml-observability
dd-java-agent/agent-llmobs/ @DataDog/ml-observability
dd-trace-core/src/main/java/datadog/trace/llmobs/ @DataDog/ml-observability
dd-trace-core/src/test/groovy/datadog/trace/llmobs/ @DataDog/ml-observability

# @DataDog/rum
/internal-api/src/main/java/datadog/trace/api/rum/ @DataDog/rum
/internal-api/src/test/groovy/datadog/trace/api/rum/ @DataDog/rum
/telemetry/src/main/java/datadog/telemetry/rum/ @DataDog/rum
/telemetry/src/test/groovy/datadog/telemetry/rum/ @DataDog/rum
Original file line number Diff line number Diff line change
Expand Up @@ -2246,26 +2246,20 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
def "test rum injection in head for mime #mime"() {
setup:
assumeTrue(testRumInjection())
def telemetryCollector = RumInjector.getTelemetryCollector()
def request = new Request.Builder().url(server.address().resolve("gimme-$mime").toURL())
.get().build()

when:
def response = client.newCall(request).execute()
def responseBody = response.body().string()
def finalSummary = telemetryCollector.summary()

then:
assert response.code() == 200
assert responseBody.contains(new String(RumInjector.get().getSnippetBytes("UTF-8"), "UTF-8")) == expected
assert response.header("x-datadog-rum-injected") == (expected ? "1" : null)

// Check a few telemetry metrics
if (expected) {
assert finalSummary.contains("injectionSucceed=")
assert responseBody.length() > 0
} else {
assert finalSummary.contains("injectionSkipped=")
}

where:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import datadog.trace.api.DynamicConfig;
import datadog.trace.api.EndpointTracker;
import datadog.trace.api.IdGenerationStrategy;
import datadog.trace.api.InstrumenterConfig;
import datadog.trace.api.StatsDClient;
import datadog.trace.api.TagMap;
import datadog.trace.api.TraceConfig;
Expand Down Expand Up @@ -714,11 +713,6 @@ private CoreTracer(
: HealthMetrics.NO_OP);
this.healthMetrics.start();

// Start RUM injector telemetry
if (InstrumenterConfig.get().isRumEnabled()) {
RumInjector.enableTelemetry(this.statsDClient);
}

performanceMonitoring =
config.isPerfMetricsEnabled()
? new MonitoringImpl(this.statsDClient, 10, SECONDS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,11 @@ public byte[] getMarkerBytes(String encoding) {
return this.markerCache.computeIfAbsent(encoding, MARKER_BYTES);
}

/**
* Starts telemetry collection and reports metrics via StatsDClient.
*
* @param statsDClient The StatsDClient to report metrics to.
*/
public static void enableTelemetry(datadog.trace.api.StatsDClient statsDClient) {
if (statsDClient != null) {
RumInjectorMetrics metrics = new RumInjectorMetrics(statsDClient);
telemetryCollector = metrics;

if (INSTANCE.isEnabled()) {
telemetryCollector.onInitializationSucceed();
}
/** Starts telemetry collection if RUM injection is enabled. */
public static void enableTelemetry() {
if (INSTANCE.isEnabled()) {
telemetryCollector = new RumInjectorMetrics();
telemetryCollector.onInitializationSucceed();
} else {
telemetryCollector = RumTelemetryCollector.NO_OP;
}
Expand Down
Loading