Skip to content

Commit 2076010

Browse files
amarzialiamarziali
authored
Merge branch 'master' into andrea.marziali/metrics-lazy
2 parents a90169c + 3039978 commit 2076010

File tree

367 files changed

+668
-578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+668
-578
lines changed

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/internal-api/src/test/groovy/datadog/trace/api/sampling @DataDog/apm-sdk-api-java
2929

3030
# @DataDog/apm-serverless
31-
/dd-trace-core/src/main/java/datadog/trace/lambda/ @DataDog/apm-serverless
31+
/dd-trace-core/src/main/java/datadog/trace/lambda/ @DataDog/apm-serverless
3232
/dd-trace-core/src/test/groovy/datadog/trace/lambda/ @DataDog/apm-serverless
3333

3434
# @DataDog/apm-lang-platform-java
@@ -131,3 +131,9 @@ dd-trace-api/src/main/java/datadog/trace/api/llmobs/ @DataDog/ml-observability
131131
dd-java-agent/agent-llmobs/ @DataDog/ml-observability
132132
dd-trace-core/src/main/java/datadog/trace/llmobs/ @DataDog/ml-observability
133133
dd-trace-core/src/test/groovy/datadog/trace/llmobs/ @DataDog/ml-observability
134+
135+
# @DataDog/rum
136+
/internal-api/src/main/java/datadog/trace/api/rum/ @DataDog/rum
137+
/internal-api/src/test/groovy/datadog/trace/api/rum/ @DataDog/rum
138+
/telemetry/src/main/java/datadog/telemetry/rum/ @DataDog/rum
139+
/telemetry/src/test/groovy/datadog/telemetry/rum/ @DataDog/rum

‎dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,26 +2246,20 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
22462246
def "test rum injection in head for mime #mime"() {
22472247
setup:
22482248
assumeTrue(testRumInjection())
2249-
def telemetryCollector = RumInjector.getTelemetryCollector()
22502249
def request = new Request.Builder().url(server.address().resolve("gimme-$mime").toURL())
22512250
.get().build()
22522251

22532252
when:
22542253
def response = client.newCall(request).execute()
22552254
def responseBody = response.body().string()
2256-
def finalSummary = telemetryCollector.summary()
22572255

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

2263-
// Check a few telemetry metrics
22642261
if (expected) {
2265-
assert finalSummary.contains("injectionSucceed=")
22662262
assert responseBody.length() > 0
2267-
} else {
2268-
assert finalSummary.contains("injectionSkipped=")
22692263
}
22702264

22712265
where:

‎dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
// to instrument the integration test
3939
iastIntegrationTestImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
4040
iastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
41-
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-9'))
41+
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
4242
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'))
4343
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet'))
4444
iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang'))

‎dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ dependencies {
5656
testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
5757
testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
5858
testImplementation project(':dd-java-agent:instrumentation:grpc-1.5')
59-
testImplementation project(':dd-java-agent:instrumentation:netty-3.8')
60-
testImplementation project(':dd-java-agent:instrumentation:netty-4.0')
61-
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
59+
testImplementation project(':dd-java-agent:instrumentation:netty:netty-3.8')
60+
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.0')
61+
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
6262

6363
latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes
6464
latestDepTestImplementation group: 'com.linecorp.armeria', name: 'armeria-grpc', version: '1.+'

‎dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,18 @@ dependencies {
7272
exclude group: 'org.slf4j', module: 'slf4j-api'
7373
}
7474
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
75-
testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty-9'))
75+
testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
7676
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
77-
testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty-11'))
77+
testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0'))
7878

7979
testImplementation(project(':dd-java-agent:instrumentation-testing')) {
8080
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
8181
}
8282
// always mix everything up
83-
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
84-
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
85-
testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-util'))
86-
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-appsec-9.3')
83+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
84+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
85+
testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31'))
86+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
8787
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
8888
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
8989

‎dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
3434
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
3535
// Also include netty instrumentation because it is used by aws async client
36-
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
36+
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
3737
testImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
3838
testImplementation group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
3939
testImplementation group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
@@ -70,7 +70,7 @@ dependencies {
7070
latestPayloadTaggingTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '2.18.40'
7171

7272
latestDepTestImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
73-
latestDepTestImplementation project(':dd-java-agent:instrumentation:netty-4.1')
73+
latestDepTestImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
7474

7575
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: fixedSdkVersion
7676
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apigateway', version: fixedSdkVersion

‎dd-java-agent/instrumentation/cxf-2.1/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ dependencies {
6161
testCompileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1'
6262
testRuntimeOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
6363
testRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
64-
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.0')
65-
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.6')
66-
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
67-
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
68-
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-12')
64+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0')
65+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6')
66+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
67+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
68+
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0')
6969
testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation')
7070
testRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
7171
testRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3')

‎dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
2828
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
2929
// Netty is used, but it adds complexity to the tests since we're using embedded ES.
30-
//testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
30+
//testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
3131

3232
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
3333
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'

‎dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
2828
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
2929
// Netty is used, but it adds complexity to the tests since we're using embedded ES.
30-
//testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
30+
//testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
3131

3232
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
3333
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'

‎dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
implementation project(':dd-java-agent:instrumentation:elasticsearch')
2727

2828
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
29-
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
29+
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
3030
testImplementation project(':dd-java-agent:instrumentation:spring:spring-data-1.8')
3131
testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')
3232

0 commit comments

Comments
 (0)